vectorizing
merging conflicts