fixed conflicts and bugs
...