Reversed removal of code in merge