Fixed up some conflicts.