Created by: joshua-warburton
Previous patches added the + symbol to dictate that a set of bits had to be non-zero but didn't update the clash detection to take advantage of this. This patch adds a check for non-zero bits that stops the detection of some false conflicts
Issues: #2626