Clean up merge mess