Comment out YCM Bundle to prevent annoying messages
Fix merge conflict