Lint
Fixed conflict
Updated version