syntax adjustments
pull and fix merge conflict