Good catch. Fixing and merging manually