fix that merge