in the previous commit resolved conflict in *.xar the wrong way