remove git conflicts marks
remove git conflicts marks

jrdjz/hugo-theme-casper,vjeantet/hugo-theme-casper,vjeantet/hugo-theme-casper,jrdjz/hugo-theme-casper,caffeineflo/hugo-theme-casper,caffeineflo/hugo-theme-casper