i love china
i love mobile
i love mobile2
resolve
first1
first2
fssss
name
create
AND
&&
MyName
wo ri
:w

Merge branch 'dev'

Conflicts:
	README.md
hate you
u
merge
resolve
d