Resolving merge conflict.
Resolving merge conflict.