auto-resolve yarn.lock conflicts

Problem to solve

I often get conflicts with master due to changes in yarn.lock. Since 99% of the time running yarn will resolve these conflicts itself.

If add a merge-driver(?) to .gitattributes we could attempt to do this automatically, saving valuable seconds.

Links / references