fixed merge problems from previous commit