Reinstate line removed in merge conflict resolution

I fail at merge conflicts.