Really fix the error with merge