Added enemy log
Solved Conflict