added div to index
merge error