Fix merge conflict properly