services module
resolving conflicts