clear another merge conflict