Avoiding merge errors for compilation trash files