Manually resolved some conflicts