[updated] merge error