manual fix merge conflicts
manual fix merge conflicts

zellerdev/jabref,jhshinn/jabref,mairdl/jabref,mairdl/jabref,tobiasdiez/jabref,ayanai1/jabref,mredaelli/jabref,grimes2/jabref,oscargus/jabref,tobiasdiez/jabref,Siedlerchr/jabref,Braunch/jabref,jhshinn/jabref,zellerdev/jabref,bartsch-dev/jabref,shitikanth/jabref,grimes2/jabref,sauliusg/jabref,ayanai1/jabref,tschechlovdev/jabref,obraliar/jabref,Braunch/jabref,obraliar/jabref,grimes2/jabref,obraliar/jabref,obraliar/jabref,mredaelli/jabref,mredaelli/jabref,tschechlovdev/jabref,sauliusg/jabref,bartsch-dev/jabref,tschechlovdev/jabref,shitikanth/jabref,ayanai1/jabref,motokito/jabref,mairdl/jabref,motokito/jabref,JabRef/jabref,oscargus/jabref,Mr-DLib/jabref,mredaelli/jabref,obraliar/jabref,shitikanth/jabref,zellerdev/jabref,Mr-DLib/jabref,sauliusg/jabref,bartsch-dev/jabref,grimes2/jabref,JabRef/jabref,Braunch/jabref,oscargus/jabref,zellerdev/jabref,mairdl/jabref,oscargus/jabref,mairdl/jabref,bartsch-dev/jabref,sauliusg/jabref,mredaelli/jabref,jhshinn/jabref,jhshinn/jabref,oscargus/jabref,Siedlerchr/jabref,Braunch/jabref,tobiasdiez/jabref,motokito/jabref,JabRef/jabref,Mr-DLib/jabref,tobiasdiez/jabref,shitikanth/jabref,Mr-DLib/jabref,motokito/jabref,shitikanth/jabref,jhshinn/jabref,zellerdev/jabref,tschechlovdev/jabref,ayanai1/jabref,tschechlovdev/jabref,Mr-DLib/jabref,ayanai1/jabref,JabRef/jabref,Siedlerchr/jabref,bartsch-dev/jabref,motokito/jabref,Siedlerchr/jabref,grimes2/jabref,Braunch/jabref