Update database structure.
Conguration file for phpMyAdmin
Resolve conflict.