🐛 (alpha update): ensure that by default is used merge.conflictStyle=merge to facilitate the review

[camilamacedo86]

Switch default Git config to use merge.conflictStyle=merge, so conflicts render as:

<<<<<<< HEAD
foo
=======
bar
>>>>>>> branch

Note after we added the configs this configuration was lost.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [camilamacedo86]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[camilamacedo86]

@vitorfloriano

[camilamacedo86]

@vitorfloriano, since this one is the default used by us, and how we doc the result, and it is tiny, I will get this one merged to facilitate the progress, but feel free to raise your concerns; we can always change something in a follow-up—just reducing the burn on the reviews for we be able to be focus where we must need.