fixing merge conflict
added regex for elipses and fixed u
hopefully this fixes the merge conflict