Git Merge Only One File