New version
Fixed conflict