Merge pull request #1 from lovesueee2/master

merge change
anther change
change2
fix confict