created test.java and commit it
Merge branch 'hotfixes'
changes in test.java
changes in test.java
in master brunch made changes in test.java
rsolving conflicts