trying to merge upstream changes back to my fork