Git Merge Individual Files