code runs without error, need to check to see if correct
merge conflicts