merge conflict
logging server side and client side work
logging session work
log out work prefect
display user info on dashboard