add syntastic
resolve conflict