How can you enter a merge in the conflicted stage?