Clean up
Fixed conflict