Remove merge-conflict lines from nanoc.yaml file