fix toXContent, build correct "index" value
make List an array
remove wirdcard import
better readablity in merge method conflict mesage and code