Hopeful jenkins fix.
Fixed merge conflict.