Logs in properly now
Fixed merge conflict