git: death to the big green merge