Fixed the release version because of conflicts