[NOP] reapplied probable merge error