Another stab at the merge job failing