Merge conflict ya veras