how do i stop conflict with ex