Take back the merge conditions until we move everything to Arel.
Take back the merge conditions until we move everything to Arel.

chiragshah/typus,thirdthing/typus,brainsome-de/typus,typus/typus,readyfor/typus,oruen/typus,readyfor/typus,brainsome-de/typus,readyfor/typus,typus/typus,thirdthing/typus,brainsome-de/typus,readyfor/typus,typus/typus,oruen/typus,burn-notice/typus,baban/typus,burn-notice/typus,burn-notice/typus,thirdthing/typus,wollzelle/typus,brainsome-de/typus,wollzelle/typus,baban/typus,chiragshah/typus,thirdthing/typus,wollzelle/typus,baban/typus,baban/typus,burn-notice/typus,chiragshah/typus,chiragshah/typus,typus/typus,wollzelle/typus