merge branch into current, updating workdir