Improve memory consumption
Match all possible conflict markers