buddy login template
fix conflicts, merge changes