conflict resolved and added operator class