leftover merge problems fixed