edited the html final
took off the conflicts again