removed <<<<<<< HEAD from words_controller