Fixed merge conflict message