Merge in refactored JS systems