exp dips propios
merge solved