discussion section
resolved a conflict