Revert "Revert "Revert "Update merge strategy for organization"""

This reverts commit d2fd038009fcb84825bb8f9b89d876120c233209.