resolving conflicts
resolving db conflicts