Update the lock file
Merge changes in