Fix conflict in indexer piston