changes to html to create merge error