Fixed the conflicts that got caused.