Fix the merge conflict.

The iOS app now runs. It does not calculate anything, but I am sure
that will be an easy fix.