error in last merge