Cleanup merge diff