adding life control
resolving conflicts