Fixed some conflicts