Enable git rerere to save conflic resolution
Add alias to delete already merged branches