Fix merge bug and set correct images link