fix code style collisions