Fixed conflicts in index
fixed conflicts in other pages