merging changes to my dev