Corrected merge conflict to not have enemies move until they're in viewport