Add merge, begin building resume system