resolved a small conflit