Merging version dir's so git handles the diffs