fixes with kate
fixed conflict