Fix merge issue with Bootstrap gem.