Updating version
Fixing conflicts