merge problems fixed