update
resolve conflicts
update
update
delete index.html
delete styles