fixing columns
conflict resolution