modify/delete conflict resolution overwrites untracked file