made changes to Ughhh.txt to resolve a merge conflict