Updated documentation
Fixed merge conflicts