Try going back to the tag.
Try downloading the zip file.
Add separate-nav patch.
Comment out first patch and see if we are ok.
Try reversing the order.
Switch open framework patch.