merge180801