Merge conflict Enemy