Fixing the generics for merge and lift
Merge pull request #860 from abersnaze/merge-generics

Fixing the generics for merge and lift