Trying to merge commits with editing the same file