FIX: from/to
MERGE