Merging in lockfile support