Talk about conflict and it's resolution