solved merge problems