Volume 3 - Issue 2: The Dharma and Bodhicitta – A Conflict Resolution