resolving merge conflicts
resolving more conflicts
New Plugins