finish lab7
fix conflict