Functional log in
Solving merge conflicts