Resolving merge conflicts
Resolving conflicts