update ispell and fix conflicts