repairs from the last merge