Attempting to fix merge issue.
Attempting to resolve merge conflict issue.