messed up main method
resolved conflicts