Merge: new option --define