Merges, fixing login.