updating things
fix merge conflicts with documentation