Merge yara & basma