Fixed incorrect merge conflict