added killing history
rm killing history
added kill his
update intro
fixed conflit