bv resolution for conflicts seems to work