fix merge conflict
update newsletter form for cm ajax
grunt