Removed merge conflict message