modified maincpp again
fix merge conflict