fixing conflicting commits

accidentally lost a few changes