fixed dictionary method and began main
fixed merge conflicts