conflicts are fixed