plugins updated
conflict resolved