post 3 terminado
merge issue
hard merge