Add conflict detection