Added lives lines
Resolved conflict used both text