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