Documenting Build process and fixing merge conflict issues.