reintegrated optimizations in the code
conflicts