merge with eldar
export.c before merge
final merge before Task 2