Started session 4 task
Trying to fix conflict
Trying to fix conflict
Finished session 6 assignment