ERT-710 / RO-12: Merging trouble