still merge problems