solving conflict