Solved some conflicts