Add Test.java & Test.class on develop branch
Add Test.java & Test.class on master branch
Fix all unresolved conflicts