login WIP
fix conflicts