lead add
:Merge branch 'master' of github.com:cs1867/team

Conflicts:
	file1.txt