better conflict detection when loading