fix john's bad merge