Removed .orig file in a pod

Probably a bad merge result
Merge branch 'develop' into feature/538-manage-blogs