Resolved all conflicts

2 jobs for population in 4 minutes and 32 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
failed linters #92149

00:04:22

passed tests #92150

00:04:32

 
Name Stage Failure
failed
linters Test
$ make check
flake8 --max-line-length=96 exposurejapan tests setup.py
exposurejapan/database.py:691:33: W291 trailing whitespace
exposurejapan/database.py:692:38: W291 trailing whitespace
exposurejapan/database.py:693:33: W291 trailing whitespace
exposurejapan/database.py:694:37: W291 trailing whitespace
make: *** [Makefile:5: check] Error 1
Cleaning up file based variables
ERROR: Job failed: exit code 1