Experimental patch to adjust merge strategy to try to improve performance
Experimental patch to adjust merge strategy to try to improve performance