conflicts twisted

