Sorted out merge