dealt with it
dealt with merge conflict. I need some coffee