Set the javadoc location
Implemented the git merging strategy

I actually call it, but the effect is the same