new c3
Repaired conflicts