Fixed merge conflicts, document should be golden