merge #2, shuffle around sections