fixed merge

examples/advection_gpu.py

@@ -139,11 +139,7 @@ if __name__=='__main__':
                 'use_builtin_copy':True,
                 'stretching': {
                     'formulation': StretchingFormulation.GRAD_UW,
-<<<<<<< HEAD
                     'order':64
-=======
-                    'order':16
->>>>>>> f03a24d1fe54c00f58e70368a14ef9043deb4581
                 }
             }
         }