Update 1.cpp

Updated in branch1 after merge