Added lives. Set default to 3
merged changes fixed conflict