change img
change index link
resolve conflict