added hair color
adding merge, I think