Conflicts almost done and sentences fixed more