added struct and start of function ls_type
mergeconfilct solved