Fixing merge conflict with level/enemy merge