Country Highway merge

updated