half done traversal
merging conflicts