Updated documentation and fixed nearest merge