I used to be acquiring precisely the same difficulty until eventually I worked out which i was endeavoring to make my challenge directory plus the Digital atmosphere one particular and the same - which is not appropriate. I found excellent explanation for How To Revert The Merge from this website