fixed merge conflict TDQ-9667 Problem to select column for analysis and
to see column