Compiling jar for java 1.5
Resolving merge conflicts in build.xml