white fur!
resolved conflict