Try this !!!
Test
Test ...
commit
Merge branch 'master' of https://github.com/rajhalli/AnotherOne

Conflicts:
	WebApp/WebApp/About.aspx