removed generalization from merging
the greatest bug fix ever