Fixed a conflict resolution mistake

effectively removing an (almost) duplicated line. Introduced by
46c41198a17b94f352cbe4e4e8c62778c442c172