cleanin up some missed correction when fixing merge conflicts