merging changes from previous repo