Rerun grunt to clear prev merge errors.