Hack to make merge work