v1.0.0
Fixed conflict