Split up the conflict checker again, this time into six different