Update hidden columns
fix merge conflict