Resolving merge conflicts
Resolving merge conflicts #2