Always solve for peace in the flock. Some birds will not fit in the flock. Cull those birds. It is a tough decision, but after you make it, you wonder what you waited for. A peaceful flock is a joy to watch. They lay better, they eat better. A stressful flock is just that, stressful. Wishing they would all get along does not work.