Fixed merge conflict.
Update plugins to latest versions (or alternatives).