fixed conflicts

...hopefully