working merge