merge stuff lost in merge