merge with starterkit