Add workaround for merged classes reusing the same db column with different names