Fixed XML mergeconflict
Fixed XML mergeconflict