fixing merge conflict and adding syntastic