Fixed some merge issues with documentation