login added
merge is dumb