Fix#3861RS_conflicttest
Fix#3861RS_conflicttest

JabRef/jabref,sauliusg/jabref,zellerdev/jabref,zellerdev/jabref,zellerdev/jabref,Siedlerchr/jabref,JabRef/jabref,sauliusg/jabref,Siedlerchr/jabref,Siedlerchr/jabref,zellerdev/jabref,Siedlerchr/jabref,JabRef/jabref,sauliusg/jabref,JabRef/jabref,zellerdev/jabref,sauliusg/jabref