Cleaned up some conflicts.