Update documentation
fixed merge issues