Fix merge fallido