Fixed some conflicts
Fixed some conflicts