Resolve merge conflicts

2 jobs for user-view-profile in 2 minutes and 4 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #153145
rubucop

00:01:56

passed #153146
test

00:02:03