fixing bug 2126
solving conflicts