add enum before merge