a code has been added to index
the conflicet has been changed