Corrected solution. Fixed merge reordering problem.