update docs, optimize merge