Add more merge strategies, move around some links