main page edit2
fix git merge error