task 2
update index
fix conflicts