Revert "Revert "Update merge strategy for organization""

This reverts commit 233eb4e4079d082c043b1a47ff2a4378e81b70a4.