how, why
comfict merge