replacing work that was lost in merge