merge error handle
merge conflicts