update problem2 files to remove unused files
fix merge