Fixed conflict
Fixed conflicts