Still bug hunting
Restored full check of Merge Conflict RSUs
(there must be one on each feeder of a merge conflict)
WJS suggested work-around for missing conflict implemented.
This was not the last bug....
Merge branch 'master' of https://github.com/OTSim/OTSim.git