Skip nil assignments inside branches when merging