attempting merge resolution.
resolving merge conflicts.