uncommented the local dep
git mergep points commented out -- -please erase them