Prevent vim from adding line breaks in long lines.
Fix merge