Just avoiding merge errors