Add an interractive 2-way merge option