changes

I think the conflict has been resolved