Merge with Adima