added plugins and merges