Fix bug with displaying course conflict at inappropriate time
Merge branch 'master' of https://github.com/weshack/WesmapsPlus