merge + continuing