Edit templates with css, fix merge error