revert merge straggler