Fixed some conflicts.