New line added- possible conflict?
did this fix the conflicts?