ruperto and eva make peace and get engaged again