Merge with Yotam