Swtich conflict checking to work as validator instead of helper. Fixes #48. Implements #30.