Update theme and upload new plugins
Update and resolve conflict