adding columntypes
resolved conflict