EulerProblem5  fixed merge conflict

This should fix the merge conflict. Clearly, I need to never use the
website to edit my programs.