fixed column bug !
fixed merge conflicts