keyword

conflict resolution from exodus 16