in a changed to blue hat, purple hat
fixed conflict picked blue