Test: Fixed breaking merge-changes