[MIG-88] Added check for indexes on the same column(s)
[MIG-88] Resolved conflicts