Added clang autocomplete
fix merge conflict