Reinstating hash.keep_merge and fixing hanging merge conflict.