Modified MainClass
resolved conflict