Resolving first access dawith no database conflict
merge conflict: frontend manager
fix #120