fix conflicts
fix the version
fix version