Updated the embedded scaladocs to the latest version
Finished the docs section on resolving conflicts
Updated the scaladocs to the latest version