Resave to resolve git conflict, should still be the same file.
Merge branch 'master' of https://github.com/themagpimag/shinything