add color to grep alias
solve conflict & merge