Fix unlock on merge