Git Merge Two Files