Fix merge problems