merge change from plato