changed column to 3
fixed conflicts
fixed conflict