Created 1.2 branch to create conflict while merge
Merge branch '1.2' into 1.1

Conflicts: Resolved
	testorg.trial/src/main/java/com/vivek/App.java