Fixing some merging mistakes
Fixing some merging mistakes