adding data set
adding data
fixing conflicts