Merge complete, Part 3 confirmed working