Force commit
Fix left over conflict message
Fix default login states