resolving merge conflicts
adding editor stuffs