sign-in feature:
ignoring log
log?
fixing conflicts