Finalize part 2
Final merge