xbps: merge proper fix for pkg conflicts against themselves.