add a animation for diff window
fix CONFLICT