Now with java file!
Merge https://github.com/RADM/GitMergePart1