merget editing