posible sol aprox
gddd
merge fix
merge