put back changes lost in last merge