Git Conflict Resolution Exercise

Name		Name	Last commit message	Last commit date
Latest commit History 6 Commits
README.md		README.md
config.json		config.json
course-list.txt		course-list.txt
grocery-list.html		grocery-list.html
team-roster.txt		team-roster.txt
team-schedule.txt		team-schedule.txt

Provide feedback