log-in
resolves conflicts