Changed the way conflict flags are propagated (fixed infinite loops, for reals this...