New commit.
Resolving merge conflicts.
resolving merge conflict.