Added test-conflict route to test broken conflict function