Adding killing history
Mrge conflict resolved