chaable to destroy courses in bookbag
revamping conflict resolution
revamping conflict resolution in progress
Merge branch 'master' of github.com:tS3m/omniDuke