Enable Syntastic
Fix merge conflict