Avoiding merge conflicts.