fix merge conflict
add syntax preferences to sublime development users