Fix for screwed merge