Merge with Shirit