added column queue to onstage
fixed merge conflict