Add new version
Fix conflicts