Git Merge Single File