merge problems, fixed