Another comments work
Added conflict file
Client commit
Merge /Users/Igor/Documents/DASchool/Homework_2/Client/Homework_2
Initiating conflict
Initiated conflict
Final commit for today