Ahh ok. I had to manually fix some conflicts. Let's sit down and work through this one.