make merge easier