updating my repository after merge