double login v1
conflicts fixed