Fix double conflict reports