[BUGFIX] merge error