Give youcompleteme a chance...
Fix git tomerge, add git topush