#567 Fix Editor conflicts