After the merge there is duplication of code: see lines 324 and 512