Handling newly added files in merge commits -- now need to handle n way merges :/