trying to change color of hat again, and resolve conflict