solving conflict and resent