MaritimeTrade work
fixing conflict
fixing build.xml