Simplified conflicts checking; minor adjustments