changed the conflicts to be filtered out again