clean up some merge errors

and update my color :>