New changes with proper clash detection