removing conflicts and adding discuss