[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c851c7: Fix merge conflicts