mod line 6
add line 7
fix conflict and commit