Rework change conflict detection