Errant conflit resolution fixed