fixed conflict

Hopefully this fixes any conflicts