full-working-version-but-missing-icons
resolve conflict