[Leadership] The Federal Government says its recent diplomatic dust-up with the United States, in which President Donald Trump threatened military intervention over alleged mass killings of Christians, "has been largely resolved".