Add conflicters check on the new files helpers