2.7.7 merge error update