forget to process conflict