This file will be the source of your merge conflicts...  I've made extensive changes to it.