Update 1.cpp
fix conflict