Added suicide and clop commands
Resolving conflicts