Automated policy conflict resolution