fix out-of-sync merge error