remove last merge error