Resolved some conflicts