merging new changes back in my fork