Added beginnings of a merge tool