checkin new file
Hot fix
checkin java file
Modified file java1
Merge branch 'issue1'

Conflicts:
	abc.java
checkin changes for verify the merge issue
commit to identify merge issue
Merge branch 'issue1'
changes done
changed
changes done
changes done