playing with stash
(commit hills)
 merged with stash
Merge branch 'newbranch'

Conflicts:
	Hills
	Lakes
trying cherry--picking