Fix conflict between git and grep aliases