Fixed log.xml conflicts