Committing pod changes.
Resolving merge conflicts.