updates. this is a terrible commit message
merge conflict fixed