Fix merge conflicts resulting from composer multi grid merge