Clash 2
resolved merge issue