Revert "Update merge strategy for organization"

This reverts commit 212c3c8387519af2073ebe29c20f429c6b19a28b.