index div
fixed merge conflict