More conflict resolution on a Friday at 5pm