Reenable locks on coverage and ensure merged is saved