old content to new template and some logos
fixed conflict