bump to 1.0.0
fix conflicts
bump to 2.0.0