modify create template to include button id annoy-me
fix merge conflict in create template