Integrated with upstream
Fixed conflict
Remoted plist
Added lock file for verioning of pods