Updated xml output
fixed merge conflict in Makefile