Merging non-git files