These 3 snippets had merge conflicts in the committed version. Changed: U trunk/Rails.tmbundle/Snippets/140 rails logging.plist U trunk/Rails.tmbundle/Snippets/170 eruby forin.plist U trunk/Rails.tmbundle/Snippets/180 rails form_tag.plist