avoid merge errors