Objects Merge: Ignoring Conflicts wasn't recursive

The ignore_conflicts flag was not propagated to inner function calls,
leading to false error messages when overriding deeper properties of
objects.

Tests included.

Fixes #401.
Merge pull request #402 from thriqon/master

Objects Merge: Ignoring Conflicts wasn't recursive