Update merge strategy for organization