Part 2: The merge. Is a bit bugged still