oops: Fix several merge conflict crashes

include/class.i18n.php

include/class.ticket.php

include/i18n/en_US/role.yaml

include/staff/templates/thread-entries.tmpl.php

include/staff/templates/thread-entry.tmpl.php

include/staff/ticket-view.inc.php

include/upgrader/streams/core.sig

include/upgrader/streams/core/9143a511-0d6099a6.cleanup.sql

include/upgrader/streams/core/9143a511-0d6099a6.patch.sql

scp/css/scp.css

setup/inc/streams/core/install-mysql.sql