Fixed the bugs of the Try.cpp
resolve the conflicts