update plugin
merging