GitLab

This change modifies the merge strategy to use the object in the
basis for the patch rather than the modified object. This allows
the three way merge to detect changes in the new object.
Signed-off-by: bryanl <bryanliles@gmail.com>