merged lockfile fix