resolved minor conflict in Util
resolved minor conflict in Util


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