M#001: Interactive merge

Final commit