Post merge commit
Merge branch 'branch1'

Conflicts:
	GitTestProject/bin/Santosh.class