Clean up incomplete merge