remove merge conlfict lines.

8 jobs for 75-rename_plotprofile in 425 minutes and 31 seconds (queued for 1 second)
Status Job ID Name Coverage
  Unit
passed bash_tests #83152

00:00:04

passed user_configuration #83151

00:00:06

29.0%
 
  Astrocyte
passed astrocyte #83153

00:00:04

 
  Single
failed paired_end_human #83154

07:05:20

failed single_end_single_control #83164

01:05:49

failed single_end_single_control #83155

01:08:26

 
  Multiple
skipped single_end_diff #83156
 
  Cleanup
skipped cleanup_job #83157
 
Name Stage Failure
failed
single_end_single_control Single
No job log
failed
paired_end_human Single
No job log