overwrite bad merge