added indexes to columns
some merge issue
changes