merged main and plugins