test push after merge conflict