move wrapped Array index and CJS wrap to develop branch, fix merge conflict

as title.