Poland's nationalist government has been trying to patch things up with France after an angry exchange of remarks between Emmanual Macron who was then France’s presidential hopeful and the Polish foreign minister. Macron was very critical of violations of democratic principles in Poland, including mounting government control over the judiciary, public administration and public media.