first commit (after accidentally deleting all my commits
solved merge conflicts