resolving conflicts
Resolving conflicts