Update modelo1.R

conflict resolution