resolve conflicts mmascher report