Resolve conflicts
no organization(s)
select master organization
select secondary organization(s)