fix conflicts, delete duplicate options for editor on navbar