attempting to merge in my first branch