FS#2388 merged

fixed merging issues