Update project_summary.md

Resolved a conflict