updated plugins
merge conflict