merging and fixing pod issue