Removed merge conflict HEAD message