problems from last merge solved