Conflict resolve
Fixed conflict