Fixed conflicts

Fixed some conflicts and more...