fix wrong template after merge