restored stuff lost in merge