Previous functionality working
Merge hell defeated