Bump to version 1.0.0
Fix merge conflict