converting code and db to utf8
updating dump files
dump file conflict resolution