Avoiding merge problems.