updated solution files
fixed merge issue with solution.md