Fixed merge and completed remember me