In our classroom we use the Conscious Discipline model for dealing with conflicts in the classroom.  You can access many helpful resources from the Conscious Discipline website