Quick translation fixes

Signed-off-by: MachinisteWeb <[email protected]>

Author: MachinisteWeb

src/v2/guide/reactivity.md

@@ -87,7 +87,7 @@ Vue.set(vm.items, indexOfItem, newValue)
 vm.items.splice(indexOfItem, 1, newValue)
 ```
 
-You can also use the [`vm.$set`](/v2/api/#vm-set) instance method, which is an alias for the global `Vue.set`:
+Vous pouvez également utiliser le [`vm.$set`](/v2/api/#vm-set) d'instance, qui est un alias de la méthode `Vue.set`:
 
 ``` js
 vm.$set(vm.items, indexOfItem, newValue)

themes/vue/layout/partials/sponsors.ejs

@@ -1,10 +1,6 @@
-<<<<<<< HEAD
-<h3>Sponsors Patreon</h3>
-=======
 <% function logo(img) { return `https://sponsors.vuejs.org/images/${img}` } %>
 
-<h3>Patreon Sponsors</h3>
->>>>>>> upstream/master
+<h3>Sponsors Patreon</h3>
 
 <%_ for (const sponsor of theme.platinum) {_%>
 <a href="<%- sponsor.url %>" target="_blank" rel="sponsored noopener" style="width: 160px;">