Merge Alex's content back into base.