Trying to merge updates to my repo