trying to get a rays code
final merge