The Nigerian government on Monday said its recent diplomatic dustup with the United States, in which President Donald Trump threatened military intervention over the alleged killing of Christians, “has been largely resolved”.