Seach rabl views with Ack
bundle exec all the things
Use diff3 style for conflicts http://blog.ezyang.com/2010/01/advanced-git-merge/