Avoiding merge errors