add changes to index
update index
fix merge