more knowldege about merging binary conflicts