Resolve conflicts

3 jobs for development in 2 minutes and 50 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Test
passed #153162
rubucop

00:01:02

passed #153163
test

00:01:07

 
  Deployment
passed #153164
staging_deployment

00:01:43