fixing merge problems from last.