merge problems gone