Clean up ugly merge