Finised oozie commit!
Merge conflict code.