added some code in main class
fixed merge conflict