double quotes replace single quotes
fix merge conflits