added 'on twoPartsToMerge branch' and 'mehtodName(){}' to Main.java
resolved conflicts in merge