add template and skip login
fix typo
fix conflict