integrated
conflicts