commit to merge
using theirs
Insert the computation at the end of file.