Reverting the custom merges