fixing bug, when merging in other cs