merged changes on index