remove git merge files
Merge pull request #2 from guanlun/master

remove git merge files