Still working on overlaps
is there a merge conflict?
second commit with merge conflicts resolved--still need to work on overlapping text