Resolving merge conflicts
Coming soon.