We are both making changes to the same line.
Solved!
Merge branch 'master' of github.com:mingqiuecon/first-repository

Conflicts:
	sea.md