Fix merge problems #2