finished small datasets
merge conflict resolutions