Resolving merge conflicts
Resolving merge conflicts