issues with merging
changed index.html