Remove merge artifacts that snuck in
Merge pull request #1 from CirrusMio/remove_merge_artifacts

Remove merge artifacts that snuck in