removing vimdiff warning and adding back ag/ack