Merge with kurava