increment version to production
fix version conflict from release-1.1 merge