Fix merge conflicts from IdrisDoc

This is just a fix for the merge conflicts in #1074.