removed git merge junk from sample cofig