Fixed merge conflict in sample.conf