Resolving conflicts for the pull request to UniMath