Most likely. Just revert the unintended changes and I see no reason not to merge.