Fix lockfile speed issues
Force locked_version on version_constraint
Fix merge conflict