Add predicvie, autocomplete, csharp-mode
Conflict resolved