fixed merge in .xise