fix merge (compiles, untested)