looked over and updated, I have some questions about what you are looking for in the psuedo code portion
merge conflict