Merge part 2 - Almost done :)