Merge with Shay