Merge Lock and Lockfile into Lockfile