Trump resolves conflicts