Revert to first merge