This is something that I had to do to merge when I pulled..