Resolved some conflicts.