first index push
merge conflict fixed