Update merge script and HOWTO_MERGE documentation.