Fix trailing whitespace and merge conflicts.

12 jobs for seobnrv3_Opt in 22 minutes and 33 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Level0
passed #50795
level0:lal

00:02:58

 
  Level1
passed #50796
level1:lalframe

00:01:35

passed #50797
level1:lalmetaio

00:01:09

passed #50798
level1:lalsimulation

00:03:21

passed #50799
level1:lalxml

00:01:07

 
  Level2
passed #50800
level2:lalburst

00:01:50

passed #50801
level2:lalinspiral

00:03:49

passed #50802
level2:lalpulsar

00:02:31

passed #50803
level2:lalstochastic

00:01:23

 
  Level3
passed #50804
level3:laldetchar

00:01:36

passed #50805
level3:lalinference

00:06:24

 
  Level4
passed #50806
level4:lalapps

00:05:59