fix merge problems
fix tests