Local changes succesfully pushed to gitlab, but pavlovia reports merging conflict

I thought about it. But assuming that this error happens again, I would need to upload the whole experiment again, creating repository after repository. I am convinced that there is something I don’t see and someone else will.