fixed my mucked up merge