WIP commit before big refactor
Traversal of graph working for simple merges, and merges with renames