Do not have static xml in java
Merge remote-tracking branch 'origin/master'