Edit_conflict loading ...