change dbcolum to merge to master
fix to avoid comflict to master