updates plugin etc
conflict