Resolve conficts for PR.