accidentally commited unmerged conflict