fix application.html and model.html after merge