Adds new stuff
Removes unnecessary plugins
Resolve conflicts