Maybe 7.0 will have a time skip or some such that allows for a soft reset on conflicts and we can get something more interesting.