Staging a merge conflict