Merge master

test/data.spec.js

@@ -52,10 +52,6 @@ test('functions in x-data are reactive', async () => {
     document.body.innerHTML = `
         <div x-data="{ foo: 'bar', getFoo() {return this.foo}}">
             <span x-text="getFoo()"></span>
-<<<<<<< HEAD
-
-=======
->>>>>>> master
             <button x-on:click="foo = 'baz'"></button>
         </div>
     `