correcting odd sync issue

sync conflict caused some problems with github for some reason