fix 12 column issue and rectify with master