fixed things that git overrode