added column check logic
fix merge