Removed random HEAD tag from merge conflict