merging recent changes from base into personal local repo