Clean up downstream merge