Better conflict detection