changes
solved merge conflicts
documentation progress