conflict working but with lots of bugs