add b64encode and b64decode, update merge tools script