add base template
merge remote