Git conflict, del remote branch
php query sql from file
joomla up from manual