Update 1.cpp
fix conflict
Update 1.cpp
fix 2
Merge pull request #4 from dwinkesuma/branch1

tes