Resolved some conflicts from no where