Changed merge error