fix all the conflicts and stuff. Good point