Removed leftover from merge conflict
Merge branch 'master' of github.com:torchbox/verdant-rca
Removed leftover from merge conflict