Add Pig conf.
Resolve merge conflicts and update paths.