adjusting conflicter a bit