Another attempt to fix merge (still experimental)