resolvendo conflitos 10-03 pt2