avoid merge error