added life display
solved mergeconflicts