Fix merge conflict