I can't get my experiment run online. Any help?

[wakecarter]

Did you make changes locally and via Gitlab?

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

My local changes are pushed to the gitlab repository, but Pavlovia does not update the current experiment, even though it detects that it was updated (The dates match under the study’s name). In addition, I tried making the experiment inactive and then pilot again, hoping it would fetch the latest gitlab version. Then I got the error message below. The experiment only contains JS costum code. Can someone advise me on how to proceed? At the moment it is unclear how the merge conflict was caused…

I believe you may need help from @apitiot