Performing a slightly dodgy merge, part two