git merge issue w/public/assets/manifest.yml file (deleted '<<< HEAD' portion)