resolve merge conflicts; debugged compose_emcoinc

3 jobs for em_coinc_circular in 7 minutes and 11 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #269611
build

00:00:13

 
  Test
failed #269613
lint

00:00:15

passed #269612
test

00:06:57

85.0%
 
Name Stage Failure
failed
lint Test
Successfully installed entrypoints-0.3 flake8-3.7.6 mccabe-0.6.1 pycodestyle-2.5.0 pyflakes-2.1.0
$ flake8 --show-source .
./ligo/followup_advocate/__init__.py:247:5: F841 local variable 'path_output_CBC' is assigned to but never used
path_output_CBC = 'need to be defined'
^
./ligo/followup_advocate/__init__.py:254:13: F841 local variable 'UL50' is assigned to but never used
UL50 = infos_X[3]
^
ERROR: Job failed: exit code 1