How do you resolve conflicts in git?
business-plan-sample-text-file.txt