merge the new changes main files and images