correct conflict