Fix getting conflicts.