Everything should be working.  Going to merge with master"