FIX MERGE VARIABLE DIFFERENCES

We had defined username as user_name as it had been agreed upon. However, the actual column was renamed to username. This commit fixes that change. It also adds a logout.