resolved quote conflicts