new practice templates
views conflict resolution