Remove erroneous merge conflict
Remove blank line
Merge pull request #177 from WorldBank-Transport/feature/clean-up-bad-merge-conflict

Remove erroneous merge conflict