update docs and build files after merge