Resolving more merge conflicts

Thanks David! And Giulio!