bunches of changes
merge, getting-started and first-template