fixing that merge