Merge branch 'CleanCode' of github.com:zmchary/Estimation_With_Two_Steps into CleanCode
creat a conflict
test merge conflict