First commit in SourceTree
Merge branch 'master' of https://github.com/inodient/gitImportedProject
Merge branch 'master' of https://github.com/inodient/gitImportedProject
Merge branch 'master' of https://github.com/inodient/gitImportedProject
Please Please
Please Please Please
Duplicated message
Merge branch 'master' of https://github.com/inodient/gitImportedProject

Conflicts:
	WebContent/WEB-INF/test/test.jsp

이거 머지.....