Remove array_get() null default value)
Remove useless else...return
merging and fixing conflicts.