starting manager
resolving merge conflict