Peace settlements are notoriously difficult to reach in religiously associated conflicts, particularly in intra-state armed conflicts where the religious identity and nature of the state is at stake. Despite that apparent intractability, however, some peace settlements have been crafted for contemporary intra-state armed conflicts where there have been religious incompatible claims and aspirations. This chapter explores the legal tools developed in such settlements and discusses their wider applicability as conflict resolution mechanisms. The analysis identifies seven specific conflict resolution mechanisms that have been utilised to address the religious dimensions of armed conflicts: constitutional secularism, religious freedom, religious power-sharing, religious autonomy, legalisation of religious political parties, inclusion of religious civil society actors and religious bonding. These seven mechanisms are analysed as part of two fundamentally different approaches to conflict resolution of religious dimensions: division vs integration; and reinforcement or decrease in the role of religion. The chapter demonstrates how religiously defined conflicts can also be transformed and brought to peaceful, negotiated endings.