Cleanup of edit-conflict Selenium test

Change-Id: I7205939f02799b8da2a2dfb49e512f1cfe96c2b9
Merge "Cleanup of edit-conflict Selenium test"