(testing) fix edit-conflict selenium tests

- JS-snipped had to be adjusted

Change-Id: I8ac1b21307fca7f27b81b49b79e9b401e8ca246c