added a try vs future benchmark
fix merge conflict
commit???