Added starter kit
Fixed merg