Avoiding merge conflicts