Conflicted solved#1

Open

lauratll wants to merge 2 commits intota-data-remote:masterfrom

lauratll:master

Commits on May 31, 2021

a change for testing conflict
lauratll
committed

Commits on Jun 1, 2021

text about me in a paralel branch to be able to pull the repo from my main branch
lauratll
committed