vietnamese/aspell: resolve conflict
russian/aspell: resolve conflict
Makefile.DragonFly