2-fix_conflicts

2nd isssue