fixed merge problems from class