Fix merge conflict U/M