solve mergeconflict

Status Job ID Name Coverage
  Test
failed #632
ruby
rubocop:ruby2.3

 
Name Stage Failure
failed
rubocop:ruby2.3 Test There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job trace