Remove missed merge conflict lines

3 jobs for 214-new-create-basic-karma-listing-for-users in 3 minutes and 27 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #11477
test:php

00:00:17

 
  Build
passed #11478
build

00:00:28

 
  Layout
passed #11479
layout

00:02:41