modify index file
modify once more
conflit fixed
modify