modifs
mysql db updates
conflict