databases/mysql55-server: resolve patch conflict
editors/vim: resolve patch conflict